From 0f044cc844fbaf81c220f9bb0586f2bd4dd96760 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Wed, 1 Mar 2017 18:53:37 -0600 Subject: [PATCH] Drop support for configure options that haven't been available in years. --- GPSBabel.pro | 2 -- config.h.in | 6 ------ configure | 47 ------------------------------------------- configure.in | 23 --------------------- csv_util.cc | 2 +- main.cc | 7 ------- msvc/GPSBabel.vcxproj | 4 ++-- msvc/config.h | 6 ------ 8 files changed, 3 insertions(+), 94 deletions(-) diff --git a/GPSBabel.pro b/GPSBabel.pro index b0651a34f..cad0bc9f1 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -178,10 +178,8 @@ DEFINES += NEW_STRINGS # We don't care about stripping things out of the build. Full monty, baby. DEFINES += MAXIMAL_ENABLED DEFINES += FILTERS_ENABLED -DEFINES += PDBFMTS_ENABLED DEFINES += SHAPELIB_ENABLED DEFINES += CSVFMTS_ENABLED -DEFINES += CET_WANTED # Creator insists on adding -W to -Wall which results in a completely # absurd amount of jibber-jabber on perfectly legally formed code. diff --git a/config.h.in b/config.h.in index 8cb52c5c4..4ec3a1e2b 100644 --- a/config.h.in +++ b/config.h.in @@ -3,9 +3,6 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD -/* 0 for most-used character sets */ -#undef CET_WANTED - /* 1 to enable the CSV formats support */ #undef CSVFMTS_ENABLED @@ -93,9 +90,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* 1 to enable Palm PDB support */ -#undef PDBFMTS_ENABLED - /* 1 to enable shapefile support */ #undef SHAPELIB_ENABLED diff --git a/configure b/configure index 36312c6b2..524533f09 100755 --- a/configure +++ b/configure @@ -646,7 +646,6 @@ QMAKE RC FILEINFO FMTS -PALM_DB_CMT EGREP GREP CXXCPP @@ -724,9 +723,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking -with_cet enable_shapefile -enable_pdb enable_csv enable_most enable_filters @@ -1361,7 +1358,6 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-shapefile=(yes)|no - --enable-pdb=(yes)|no --enable-csv=(yes)|no --enable-most=(yes)|no --enable-filters=(yes)|no @@ -1370,7 +1366,6 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-cet=(default,all,minimal) --with-zlib=(included)|system|no --with-doc=DIR Path where the documentation will be stored. @@ -4540,31 +4535,11 @@ _ACEOF fi - -# Check whether --with-cet was given. -if test "${with_cet+set}" = set; then : - withval=$with_cet; cet="$withval" -else - cet="default" -fi - - if test $GCC = yes; then CFLAGS="$CFLAGS -Wall" CXXFLAGS="$CXXFLAGS -Wall" fi -if test "$cet" = "all"; then - -$as_echo "#define CET_WANTED 1" >>confdefs.h - -fi -if test "$cet" = "default"; then - -$as_echo "#define CET_WANTED 0" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support shapefiles" >&5 $as_echo_n "checking whether to support shapefiles... " >&6; } # Check whether --enable-shapefile was given. @@ -4585,28 +4560,6 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support Palm/OS pdb formats" >&5 -$as_echo_n "checking whether to support Palm/OS pdb formats... " >&6; } -# Check whether --enable-pdb was given. -if test "${enable_pdb+set}" = set; then : - enableval=$enable_pdb; enable_pdb="$enableval" -else - enable_pdb="yes" -fi - - if test "$enable_pdb" != "no" ; then - -$as_echo "#define PDBFMTS_ENABLED 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - PALM_DB_CMT=# - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support csv formats" >&5 $as_echo_n "checking whether to support csv formats... " >&6; } # Check whether --enable-csv was given. diff --git a/configure.in b/configure.in index ffa67430c..ee4e9168e 100644 --- a/configure.in +++ b/configure.in @@ -52,21 +52,11 @@ AC_C_BIGENDIAN # Checks for libraries. AC_CHECK_LIB([m], [cos]) -AC_ARG_WITH(cet,[ --with-cet=(default,all,minimal)], - cet="$withval", cet="default") - if test $GCC = yes; then CFLAGS="$CFLAGS -Wall" CXXFLAGS="$CXXFLAGS -Wall" fi -if test "$cet" = "all"; then - AC_DEFINE(CET_WANTED, 1, [1 for all character sets]) -fi -if test "$cet" = "default"; then - AC_DEFINE(CET_WANTED, 0, [0 for most-used character sets]) -fi - AC_MSG_CHECKING(whether to support shapefiles) AC_ARG_ENABLE(shapefile, [ --enable-shapefile=[(yes)|no]], @@ -78,19 +68,6 @@ AC_ARG_ENABLE(shapefile, AC_MSG_RESULT(no) fi -AC_MSG_CHECKING(whether to support Palm/OS pdb formats) -AC_ARG_ENABLE(pdb, - [ --enable-pdb=[(yes)|no]], - [ enable_pdb="$enableval"],[enable_pdb="yes"]) - if test "$enable_pdb" != "no" ; then - AC_DEFINE(PDBFMTS_ENABLED, 1, [1 to enable Palm PDB support]) - AC_MSG_RESULT(yes) - else - PALM_DB_CMT=# - AC_MSG_RESULT(no) - fi -AC_SUBST(PALM_DB_CMT) - AC_MSG_CHECKING(whether to support csv formats) AC_ARG_ENABLE(csv, [ --enable-csv=[(yes)|no]], diff --git a/csv_util.cc b/csv_util.cc index 405838937..9fe3d117d 100644 --- a/csv_util.cc +++ b/csv_util.cc @@ -157,12 +157,12 @@ in_word_set(register const char* str, register unsigned int len); /****************************************************************************/ /* obligatory global struct */ /****************************************************************************/ -XcsvFile xcsv_file; extern char* xcsv_urlbase; extern char* prefer_shortnames; #if CSVFMTS_ENABLED +XcsvFile xcsv_file; static double pathdist = 0; static double oldlon = 999; static double oldlat = 999; diff --git a/main.cc b/main.cc index b5a1bdb0e..ee3ac119a 100644 --- a/main.cc +++ b/main.cc @@ -208,17 +208,10 @@ print_extended_info(void) "CSVFMTS_ENABLED " #endif -#if PDBFMTS_ENABLED - "PDBFMTS_ENABLED " -#endif - #if SHAPELIB_ENABLED "SHAPELIB_ENABLED " #endif -#if defined CET_WANTED - "CET_ENABLED " -#endif "\n"); } diff --git a/msvc/GPSBabel.vcxproj b/msvc/GPSBabel.vcxproj index 036dfd3da..ea2ea8bbc 100644 --- a/msvc/GPSBabel.vcxproj +++ b/msvc/GPSBabel.vcxproj @@ -74,7 +74,7 @@ Disabled EnableFastChecks MultiThreadedDebugDLL - _CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;PDBFMTS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;CET_WANTED;QT_CORE_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_CORE_LIB;%(PreprocessorDefinitions) _DEBUG;%(PreprocessorDefinitions) @@ -87,7 +87,7 @@ false Size true - _CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;NDEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;PDBFMTS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;CET_WANTED;QT_CORE_LIB;%(PreprocessorDefinitions) + _CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;NDEBUG;_CONSOLE;HAVE_LIBEXPAT;MAXIMAL_ENABLED;FILTERS_ENABLED;SHAPELIB_ENABLED;CSVFMTS_ENABLED;QT_CORE_LIB;%(PreprocessorDefinitions) NDEBUG;%(PreprocessorDefinitions) diff --git a/msvc/config.h b/msvc/config.h index e1e698f2f..b5cd673b5 100644 --- a/msvc/config.h +++ b/msvc/config.h @@ -8,9 +8,6 @@ // Define to zero for the common UTF-8, ASCII and related sets. // Define to one for everything we know. -/* 0 for most-used, 1 for all character sets */ -#define CET_WANTED 1 - /* 1 to enable as many formats as possible */ #define MAXIMAL_ENABLED 1 @@ -20,9 +17,6 @@ /* 1 to enable all the filters. */ #define FILTERS_ENABLED 1 -/* 1 to enable Palm PDB support */ -#define PDBFMTS_ENABLED 1 - /* 1 to enable shapefile support */ #define SHAPELIB_ENABLED 1 -- 2.30.2